Merge pull request #22 from jpcardona/master

XXXXXXX
Merge pull request #23 from jpcardona/jeison3

Merge pull request #22 from jpcardona/master