Closes #85