This closes #31