Merge branch 'release-0.5.0' into develop
fixes #212
Merge pull request #217 from vrabaud/fixes_212

fixes #212
0.5.1
Merge branch 'release-0.5.1'