Merge tag '1.0.0' into develop

Release 1.0.0
Small refactor of test.
Merge tag '1.0.1'

Release 1.0.1