first integration of angular
master