fixes #26
Merge branch 'develop'