Preparing new release: 0.5.0
Merge branch 'releases/0.5'
Merge branch 'master' into develop