Merge pull request #1 from wenjiegit/master

merge