Myg000 54

Update from master and review service code
cool! (the filter in Angular)