Dependency upgrade
Taking inspiration from #147