Fixes #3

Code
Awesome job! Go ahead and merge this back into master.