GUI
Merge pull request #62 from PhilippSteiner/Philipp

GUI