Now PSR-0 compliant