DI changes after review
Merge branch 'develop' of https://github.com/UrlHandler/QuickStart into develop