Fixes #3

Review and merge my changes
Awesome job! Go ahead and merge this back into master.