This closes #81