Windows fixes
1.0.4
Merge branch 'release/1.0.4' into develop