Closes #33

Closes #33