Merge pull request #1 from arathnim/master

Grabbin' New Code