Revert "Merge pull request #33 from emeraldimp/master"

This reverts commit b6bd6c83449a7f7433fea293ab8eb4f5c92cff71, reversing
changes made to 23f5137367973aa9f5a40327d510d854b6a99556.