Modified to PSR-0 standard