update version
Merge branch 'release_1.0.4'