version bump to 0.5
Merge branch 'release-0.5'
Merge branch 'master' into develop