Closes #86