Merge branch 'master' into ui
ui fix
Merge branch 'master' into ui
error handler added
error handelr function now work
error handler v.1 finished
Merge pull request #3 from aliab/ui

Ui