added autoload
Merge branch 'hotfix/autoload'