commit from zouteng@github
Merge pull request #8 from zouteng/master

commit from zouteng@github