FINAL VERSION '.
Merge branch 'master' of https://github.com/crhallberg/gradthesis