Merge pull request #2 from TimmyHuang/master

update