GUI
issue fixed
master next
Merge branch 'issue1'