Merge tag '1.0.3' into develop

version 1.0.3
c
Merge branch 'release/1.0.4'