Merge branch 'release-0.4.7'
Merge branch 'master' into develop
intermediate commit (curly brackets problem)
Merge branch 'develop'
fixes #4
Merge branch 'master' into release-0.4.7