Added switch control
Merge branch 'master' of https://github.com/MAAABBWZTGGE/Appli