Merge pull request #19 from lianqin7/master

merge master