In my opinion also fixes #3

Another thing to kill
Awesome job! Go ahead and merge this back into master.