Merge branch 'master' into develop
minor updates
Version bump to 0.5
bump commit
build commit
Merge branch 'release-0.5'