This closes #114