Merge branch 'master' into develop
correct add class
Merge branch 'issue-35' into develop
update version
Merge branch 'release_0.1.15'