fix default not defined
Merge branch 'develop'
version update
Merge branch 'release/0.2.1'