This closes #193