bugFix

BuGFix
Merge branch 'master' of https://github.com/bobbyziom/AquaControl