Merge pull request #1 from edthebat/master

Changes!
eh again
Merge pull request #1 from wildweasel486/master

Synchronize with original