Fixed bugs with __DIR__ and __METHOD__
merged, resolved conflicts