This closes #110