Bug fix
Merge branch 'release/1.0.0'
Merge tag '1.0.0' into develop

Release 1.0.0