This closes #39