Bump the version number to 1.0.4
Merge branch 'release-v1.0.4' into develop