This closes #120