coding # quitando querys
Merge branch 'feature/312'