Merge pull request #1 from wxing89/master

sync