update to recent version from rubenwardy