fix a path related to the PSR-4 update
Merge pull request #62 from xabbuh/psr4-update

fix a path related to the PSR-4 update
final path fix related to the PSR-4 update
Merge pull request #63 from xabbuh/psr4-final-path-fix

final path fix
fix mapping path
Merge pull request #64 from xabbuh/mapping-directory-fix

Mapping directory fix
Merge branch '1.1'