merged back the rest of my changes to the thesis style
Merge pull request #9 from hannesm/more-enhancements

merged back the rest of my changes to the thesis style