Merge pull request #1 from iseethespade/master

makePeg