Merge pull request #11 from renzongxian/master

merged Show-Me-the-Code:master from renzongxian:master
Merge pull request #2 from Show-Me-the-Code/master

Merge pull request #11 from renzongxian/master