Merge pull request #69 from fxbonnet/master

Url rewriting refactoring