Merge pull request #1 from paddingme/master

update
Merge pull request #8 from fex-dream/master

Merge pull request #1 from paddingme/master