This closes #115