Fix for #23
Bump version
Merge branch 'develop'