Merge pull request #2 from bernard-zh/master

Merge pull request #1 from zhanglintc/master
//some modification made by lane
//some modification made by lane
//some modification made by lane again and again
Merge pull request #2 from zhanglintc/master

from zhanglintc to bernard