1.0.4
Merge branch 'feature/1.0.4' into develop