Merge branch 'hotfix/1.0.1' into develop
fixed syntax error
Merge branch 'hotfix/1.0.2'
Merge branch 'hotfix/1.0.2' into develop
Merge branch 'develop'