Merge branch 'release/1.0.4'
Merge tag '1.0.4' into develop

Version 1.0.4