Fix and improve PSR-4
Merge pull request #8 from hfcorriez/zh_CN_fix_PSR4

Fix and improve PSR-4