Angular

@ethanspiro  - Merge to master please.