Closes #1

Ope, I ended up doing it right away. Closing.