some changes to merge
Merge branch 'master' of github.com:martinmeinke/Studienarbeit_Ocelot
new changes