Commit from school 10.06.2014 - 14:00