Merge pull request #11 from ldurazo/master

Merge pull request #6 from ldurazo/master
Merge pull request #3 from jmsalcido/master

Merge pull request #11 from ldurazo/master