Private changes made during the work on my master-thesis