funny mistake!
Merge branch 'master' into ui
fix pull request and clean up code
Merge pull request #6 from aliab/ui

Ui