Merge branch of Ganster41 into ics