- simplify FQN
- some fixes to comfort with psr2
small fixes
Merge pull request #510 from tiger-seo/master

small fixes