Merge branch 'dev'
fixed autoload path