Increase version
Merge branch 'release/1.0.4' into develop
Merge branch 'develop' into gh-pages