Commit from school 09.06.2014