This closes #71