Closes #32