Dependecy injection all the way
Merge remote-tracking branch 'origin/master'
Dependecy injection all the way