This closes #58