change
Merge pull request #2 from ChineseJohn/master

change again