Edits by Zhouyu 27/10/2014
Merge pull request #1 from zyfu/master

Edits by Zhouyu 27/10/2014