Look! This fixes #3

I think I've got it right this time!! :)
Awesome job! Go ahead and merge this back into master.