This closes #147