started bug fix
Merge branch 'master'
Merge pull request #2 from ITAfrique/bug_fix2

Fix bug on UI