Diploma and Master's Thesis