Closes #88