This closes #73