Merge pull request #81 from kipe/wikipedia

Wikipedia redirect handler
Merge remote-tracking branch 'upstream/master'