Merge pull request #1 from kiselvserg/gui

Gui
Merge branch 'master' of https://github.com/Centimo/CGM into gui