Revert "Merge pull request #8 from itexico/48"

This reverts commit 00e1e000effed1256410ea68a6a81c5418e93233, reversing
changes made to fad31983306914fcb4a595daa504ddb4006e3213.