New version, fixed autoload.