Revert "Merge pull request #17 from fabianomathilde/master"

This reverts commit 82b11defb5b942f4be7d2ac10d6708eb0088e4c8, reversing
changes made to 70b29ba5b90c7d1a8cdf7211add280f0f320f53d.