working on corrections
Merge branch 'master' of https://github.com/evil0sheep/MastersThesis
finished corrections