Merge pull request #2 from xchliu/master

sync