Merge pull request #280 from wagnert/master

Performance optimizations by refactoring DI provider + switch to latests...