fixed bug from merging
fixed bug from merging

antingshen/BeaverDam,xysense/BeaverDam,xysense/BeaverDam,antingshen/BeaverDam,antingshen/BeaverDam,xysense/BeaverDam,antingshen/BeaverDam,xysense/BeaverDam