This closes #144