Merge pull request #13 from hakcenter/ics

Merge fixes