Revert "Merge pull request #29 from rnecesito/master"

This reverts commit 59d987c5600887cc77beea361f55cdbd069cd539, reversing
changes made to 830cb72a6ac401160df5a3808b014420890a11b6.
Revert "Revert "Merge pull request #29 from rnecesito/master""

This reverts commit 3f1b66940929adb6ff76e19d3dae828a40256c6f.
Merge pull request #1 from jbantug/master

Revert merge