closes #147