Merge tag '0.1.x' into develop

bla bla bla
Merge branch 'release/1.0.0'