Merge pull request #1 from evansde77/develop

Develop
Merge branch 'master' into release/0.0.2