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

Merge pull request #4 from evan10s/master
Merge pull request #6 from evan10s/v0.2-beta

v0.2 beta
Merge pull request #7 from evan10s/master

Merge v0.2-beta Branch with Master Branch