Merge pull request #2 from antonyliang/master

Merge