This closes #135