New version of Master Thesis