Merge branch 'develop' of github.com:m0ep/master-thesis into develop
misc stuff