Merge branch 'release-0.5.0'
Fixing #42 and bumping version number.
Merge branch 'hotfix-0.5.1' into develop