Merge pull request #15 from xiaoqin2012/master

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

Merge pull request #15 from xiaoqin2012/master