Closes #65

Hopefully...