Merge pull request #621 from atomizer/master