Merge branch 'master' into develop
merge v0.1.3
fix javadoc warning
fix javadoc warning