Merge pull request #1 from doingmw/master

Whatup Dawg
Merge pull request #1 from GFXDude2010/master

Merge pull request #1 from doingmw/master