autoloader fix
merge branch master