Closes #93