Update to bernard master