Modified diploma project, added chapter 2.1