Reduce coupling from web container
Refactor for PSR-2 compatibility
Merge pull request #8 from wagnert/master

Reduce coupling from web container