This closes #47