Merge pull request #1 from nicolaschengdev/master

update