This closes #108