This closes #86