fat fingers fix.
Merge pull request #1137 from ralpheav/master

Adding Criteria to Autoloader