This closes #111