Merge branch 'master' into ui
bug fix
Merge branch 'master' into ui
Merge branch 'master' into ui
error handler fixed
Merge branch 'master' into ui
fix things
Merge branch 'master' into ui
Merge pull request #7 from aliab/ui

Ui