fixes #30
Merge branch 'develop'