This closes #59