Make compatible with PHP 5.3/5.4
Merge branch 'master' of github.com:dennisbirkholz/di