Test
Merge branch 'master'
Merge branch 'master'
Add User Control and Save Settings
Add User Control
Merge pull request #21 from Mirage20/Mirage

Mirage