Merge pull request #255 from wagnert/master

Add DependencyInjectionContainer as manager implementation + refactoring...