Release v0.5.0
Merge branch 'master' into feature/12