Refacto
angular v1.3.5 compatibility
Merge pull request #6 from nchaulet/nc-feat-refacto

Refacto and angular 1.3.5 compatibility