UI ON/OFF switch
Merge remote-tracking branch 'upstream/master'
Merge pull request #10 from oliverds/master

UI ON/OFF switch