Feature/angular and inuit, fixes #2