Merge tag '1.0.5' into develop

version 1.0.5
s
Merge branch 'release/1.0.6'