Revert "Merge pull request #10 from lexfernandez/devel"

This reverts commit c68b72230f240cc9ad5677e08fe1100df848b598, reversing
changes made to b6211a75a767a0f217fd32b94b632dc5922d9949.