Merge pull request #20 from ivannis/master

Renaming _criteria and _sorting parameters in Controller\Configuration