Commit from school - 17.06.2014