merge with master before 1st release with fuel monitoring prototype