some fixes
Merge branch 'master' of https://github.com/PabloGit88/conagra.git