Fixed autoloading
fixed merge