Fix bugs
Update version
Merge branch 'release/0.1.5' into develop