commit from E
Merge branch 'master' of https://github.com/Khabermas/PML-project.git