Merge pull request #1 from cfloresm/master

Merge pull request #16 from cflores/master
Merge pull request #18 from cflores/master

Merge pull request #1 from cfloresm/master