Huehue fixes #3

Fixes #3 
Awesome job! Go ahead and merge this back into master.