test added
Convert to PSR-0