Fixes #4

Fixes #4.

Also has other cool stuff.