Merge pull request #8 from donnieberg/angular

Angular
sunday AM
Fix angular bug
Merge branch 'master' into angular