Some minor updates
Release 1.0.4 stable
Merge branch 'develop'