Merge pull request #12 from PhilippSteiner/Philipp

Philipp
GUI
GUI
Merge pull request #13 from PhilippSteiner/Alex

Alex