Merge pull request #21 from 17173/v1.x

v1.0.4
update readme
Merge branch 'master' into v1.x

Conflicts:
	README.md