Merge pull request #15 from therebelrobot/develop

Merge into master
Merge pull request #17 from therebelrobot/develop

Merge into master
Update package.json
Merge branch 'master' into release/0.1.0
bumped version