more fixes
Merge branch 'master' of https://github.com/Xander89/master_thesis