fix autoload configuration
Merge pull request #14 from tonimunthi/develop
Merge pull request #15 from dayax/develop

merge to develop