Added support for angular (although I think it's wrong this way)