Fix issue #2
Merge branch 'UI_Frontend'