dependency injection
Merge branch 'master' into added-workspaces