Master

Fixed indexes are not updated on MapLoader::loader and MapLoader::loadAll