This closes #6