Merge pull request #1 from zfaustk/master

Pull
UI

UI
Merge pull request #1 from solamiku/UI

Ui