Merge pull request #1 from angelXwind/master

Updates
On Screen Control setting works
Merge pull request #22 from dchavezlive/master

Fixed 'On Screen Control' setting