weshoke Merge pull request #2 from czfshine/master