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

Merge pull request #7 from evan10s/master
Merge pull request #9 from evan10s/master

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