Merge pull request #38 from devinsays/develop

Version 0.8.0 Merge
Merge pull request #39 from devinsays/master

Merge pull request #38 from devinsays/develop