new style
Merge branch 'master' of https://github.com/alexdrk/wikipedia