Merge tag '1.0.6' into develop

version 1.0.6
s
Merge branch 'release/1.0.7'