Merge tag '1.0.1' into develop

tag 1.0.1