limpio codigo, simplifico y unifico
Merge pull request #22 from movilla/develop15

limpio codigo, simplifico y unifico