Bug and scope fixes
0.5.4
Merge pull request #34 from AHPWN/dev

v0.5.4