Revert "Merge pull request #5 from ggderas/CarlosA"

This reverts commit b75729f2e38ff7e4affe8ba1ba032ce3dab6cc4d, reversing
changes made to ffd20847fb000538e2b88ec4db3bba64ba72b1c2.