Minor fix
Merge branch 'develop'
Update version to 0.1.0
Merge branch 'develop'