merge franco's git: slimbus