Contador
Merge branch 'master' of https://github.com/reimerghost/chie