Merge pull request #20 from alfeko/master

UI Update
Merge pull request #25 from alfeko/master

Updated with master
PreSync Commit
Merge Fix
UserControl

Switched to userControls
pre fix commit