Merge pull request #2 from weixiaobo88/master

merge latest code