Issues/50 from ical rebased