Adopt changes of 0.1.62
Merge pull request #5 from joa/master

Adopt changes of 0.1.62