Replace direct instanciation with injection
Merge pull request #13 from wagnert/master

Replace direct instanciation with injection