Added PSR-0 compliance