Merge pull request #15 from xiaoqin2012/master

merge from xiaoqin