Release version: 0.5.0
Merge branch 'develop'