Merge branch 'release/1.0.4' into develop
add release date to CHANGES
Merge branch 'develop'