Merge pull request #28 from Supermathie/update-020