Version 0.5
Merge branch 'release-0.5'