This closes #12