This fixes #4

Well this is nice.
Awesome job! Go ahead and merge this back into master.