Fixing autoload detection. Thanks to @nguyenk for the fix.
Fixing merge