Fix angular bug
Merge branch 'master' into angular
Merge pull request #9 from donnieberg/angular

Angular