This closes #97