testcommit
Merge pull request #1 from ixowuif/feature/test1

testcommit
Merge branch 'release/v1.0.4'
Merge branch 'master' into feature/test5