Merge branch 'master' into develop
Merge branch 'master' into develop
add zh string.
Merge branch 'gix/ch_string' into develop
bump up version.
Merge pull request #9 from padule/release/1.0.4

Release/1.0.4