This closes #27