Merge tag '1.0.1' into develop

1.0.1
Merge branch 'master' into develop
Merge branch 'release/1.0.2'