Fix #54
Merge pull request #56 from teddychoi/0.2-maintenance

Fix #54