Version 0.5
Merge branch 'develop'