Fix composer
Adding doc files
Merge branch 'feature/composer' into devel