final diploma thesis version