Merge pull request #6 from aliab/ui

Ui
Merge branch 'master' into ui
bug fix