Closes #147