This closes #26