Adopted changes of 0.1.55
Merge pull request #4 from joa/master

Adopted changes of 0.1.55