New 1.0.4-SNAPSHOT version
Fix merge conflicts