Merge pull request #12 from ldurazo/master

Merge pull request #12 from ldurazo/master
Merge pull request #4 from jmsalcido/master

Merge pull request #12 from ldurazo/master