One more thing to kill fixes #3

Fixing #3, I hope.
Awesome job! Go ahead and merge this back into master.