version 0.6.1
Merge branch 'develop'