Bug fixes
0.5.1
Merge pull request #31 from AHPWN/dev

v0.5.1