Merge branch 'release/1.0.4' into develop
updated deps
Merge branch 'develop'