Merge branch 'release/0.1.4' into develop
Merge pull request #11 from saschakiefer/develop

Merge branch 'release/0.1.4' into develop