Merge pull request #7 from evan10s/master

Merge v0.2-beta Branch with Master Branch