Fixes #3.

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