Part 2
Merge pull request #1 from moyicat/master

Part 2