One more attempt..
Merge pull request #360 from michaelDpierce/angular_fixes

One more attempt..