Merge pull request #22 from jpcardona/master

XXXXXXX