Revert "Merge pull request #10 from dfs-sh/master"

This reverts commit 46436e3abc5b89bcc4933b2fc3644dc7bdf69b13, reversing
changes made to 254b0deb10e0a8086ed2dc6e6581b9f4c054b1fa.
Merge pull request #11 from pief/revert_pull_request_10

Revert "Merge pull request #10 from dfs-sh/master"