This closes #11