v0.2
Merge pull request #5 from micahhausler/develop

v0.2