Closes #92