This closes #18