Commit from 23.april
Merge branch 'master' of https://github.com/Ingis/Master_thesis