Merge branch 'release/1.0' into develop
cleaning
better error msg
minor fixes
Merge branch 'release/1.0.1'