fixed psr-0 compliance