fixes #3

Fixing (hopefully) and adding to Master
Awesome job! Go ahead and merge this back into master.