Closes #89