Version bumped from 0.4.1 to 0.5
Merge branch 'release-0.5'