Merge pull request #61 from hoxxep/master

Fixed issues #56 and #57 plus some tiny cleanup (and maybe #48)
Bump to v0.5.5
Merge pull request #1 from fians/master

Bump to 0.5.5