Revert "Merge pull request #2 from kamicollo/master"

This reverts commit a8d039e5d5318e1e6e4eea68f74131a976a6c43a, reversing
changes made to bb907a59e4d6868a721dc8b52e1aa4ae4eabd633.
Revert "Revert "Merge pull request #2 from kamicollo/master""

This reverts commit 4131f30bee6927dfdb74d5bc33d5921e84e5a087.
Fixed URL rewriting.