Merge branch 'release/v1.0.1' into develop
Merge pull request #1 from timothyhahn/develop

Merge branch 'release/v1.0.1' into develop