* Fixed additional namespacing problems and compatibility with PSR-0