more fixes
Merge branch 'release/1.0.4'