Merge tag '1.0' into develop

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