master on / off switch implemented
Merge remote-tracking branch 'origin/master'