This closes #8