Fixed preprocessor bug
Merge pull request #51 from fabian1995/GUI_development

Merge GUI_development to master