Init UI
Merge master into init_ui
Merge pull request #5 from rhokbrisbane/init_ui

Init UI
merge master