Fixes #3

New pull request
Awesome job! Go ahead and merge this back into master.