This closes #37