Merge branch 'master' of gitlab.uni-koblenz.de:robbie/homer_mapping into refactoring/cpp_optimization