Merge pull request #8 from evan10s/v0.2-beta

Merge pull request #8 from evan10s/master