Bug hunt VI: I'm an Idiot Edition!
Merge pull request #2 from LazDude2012/master

.