Merge branch 'release/1.0.4' into develop
Merge pull request #2 from marinexplore/develop

Merge branch 'release/1.0.4' into develop