bumped to version 0.6.0
Merge branch 'develop'