Added ui button func
Merge remote-tracking branch 'origin/master' into ui
Merge pull request #15 from Smilex/ui

Ui