README developer-branch
third commit
commit from cnpallares-branch
conflicts fixed