Merge tag '1.0.4' into develop

1.0.4
Merge branch 'master' into develop
Updated Changelog
Merge branch 'release/1.0.5'