PSR-0 Compliance
Merge branch 'psr-compliance'