Fixed the bugs with the autoloader
Fixed merge issues