Merge pull request #4 from wangbo6886/master

merge