This closes #126