Merge branch 'master' into develop
update NanoCLI
rebuild version 1.0.0 p5
Merge branch 'develop'