Adopt changes of 0.1.62
Fix potential NPE
Merge pull request #3 from joa/master

Adopt changes of 0.1.62