added psr-0 support