fix autoload
Merge branch 'dev'