Fixed your shit some more.
Merge pull request #2 from cgaebel/fix-yo-shit-v2

Fixed your shit some more.