Made some changes specific to our needs
Merge pull request #1 from ztbrown/angular

Made some changes specific to our needs