Merge pull request #1 from topnotcher/master

changes from Greg
Merge pull request #1 from bowserthewizard/master

herp derp