Refactored
WIP
Changed the way crigeria is extracted from query params
Some fixes
Fixed tests for versions under 5.4
Test fix
Test fix
Test fix
Test fix
Merge pull request #8 from amartinj/master

Refactor and some improvements