Merge branch 'master' into develop
add comments
fixed namespace bug and rebuild version 0.9.5
Merge branch 'develop'