Merge git://github.com/christiaanb/thesispresentation