fixing dependency injection
Merge branch 'master' into gh-pages
comp