Merge pull request #3 from xiaoqin2012/master

merge from xiaoqin