Added PSR-0 conformance