Work on ICS/ICAL output - for issues #253 and #254