try to fix bugs
Merge branch 'master' of https://github.com/veget88/VacuumES_EnvironmentB