Merge branch 'release/0.1.1' into develop
Merge pull request #3 from shillingp/develop

Merge branch 'develop' into master