This closes #96