Merge pull request #48 from wagnert/master

Switch to DI container usage for property injection