This closes #7