add autoload and fix class
Merge branch 'develop'