Merge branch 'hotfix/0.1.1'
Fixed a bug
Modified default value of parameters
Merge branch 'hotfix/0.1.2' into develop