This closes #13