Merge tag '1.0.4' into develop

version 1.0.4
c
Merge branch 'release/1.0.5'