Merge tag '1.0.2' into develop

tag 1.0.2