Feature/with angularjs