Adding Criteria class to the autoloader.
Merge pull request #1136 from ralpheav/master

Adding Criteria to Autoloader