This closes #42