Feature/ics compatibility

Almost 11 and a half months in the making. :-D