Merge pull request #12 from 17173/v1.x

V1.0.1
Merge pull request #13 from 17173/v1.x

V1.x
Merge pull request #14 from 17173/v1.x

V1.x
Merge pull request #17 from 17173/v1.x

V1.0.2
Merge pull request #18 from 17173/v1.x

V1.x
v1.0.3