Merge branch 'release/0.5.0' into develop
Merge pull request #1 from jnyman/develop

Merge branch 'release/0.5.0' into develop