Update: maintained by Bridge Foundry

New and improved pull request :smile: