Merge branch 'develop'; fixes #38