Closes #31
Merge pull request #36 from felixflores/master

Closes #31