Moar glitches!!

DEADLY GLIOTCHZEZZ

Crap. Accidentally included contents of Pull request #19 in here too. Sorry!