Revert "Merge pull request #3 from karlgroves/master"

This reverts commit 4e1c4f1841aa12513cd34cd2f62da62f429c1fb3, reversing
changes made to 2cb371668b63b002e56aef4c0cc0ec933919c889.
Merge pull request #4 from shower/pull_revert

Revert "Merge pull request #3 from karlgroves/master"