Changed from dom-man to angular
merged