Merge pull request #2 from zhanglintc/master

from zhanglintc to bernard
//some modification made by bernard 1st
Merge pull request #3 from bernard-zh/master

some comment added by bernard, checked and merged by lane