Changed to work with raw angular
Merge branch 'fix_to_angular'
Fixed tests