- psr-4
- fixing #16 and #17