Merge pull request #1 from paddingme/master

update