Fixes #32, holy crap I'm glad this one is done...