Merge branch 'feature/fix-autoloader-path' into develop

Fix #8