Merge pull request #1 from iseethespade/master

makePeg
Merge pull request #1 from lcutsing/master

Merge pull request #1 from iseethespade/master