Revert "Merged pull request #9."

This reverts commit bdd3996d38d885e18e5c5960df1c2c06e34d673f, reversing
changes made to fd0a1b26db73410692acdd21e36a3ea58e6fe4b5.
Revert "Revert "Merged pull request #9.""

This reverts commit c6998fcc9ebbbd5e32d8f63a52af968a6c691283.