Merge branch 'master' into develop
autoload to tests
fix travis
Merge branch 'develop'