Put all the changes back.. Revert my reverting of a reversion of this revert.

Revert "Merge pull request #127 from nepeat/master"

This reverts commit bba8f8357a0457e0b5289229a3d4002f011be574, reversing
changes made to bf9b1b2f3a7c283c62a0ec7be166e518775f522a.