This closes #25