Merge pull request #3 from xiaoqin2012/master

merge from xiaoqin
Merge pull request #8 from piaw/master

Merge pull request #3 from xiaoqin2012/master