Merge branch 'release/v0.4.0' into develop
Merge pull request #56 from hollandben/develop

Merge branch 'release/v0.4.0' into develop