Merge branch 'develop'
Bump version to 0.0.6