Final overall improvements
Merge branch 'master' of github.com:Noemj/bsc_thesis