GUI somehow works
Merge pull request #20 from zpp-2014-15/gui_update

GUI somehow works