bug fix
Merge branch 'master' of https://github.com/m0r17z/thesis