refactoring to comply with psr-4 + phpspec test
Merge remote-tracking branch 'origin/master'