Make it work with Angular 1.0+
Merge branch 'master' into gh-pages