CA fix
Merge branch 'master' of https://github.com/astroids/coca-cola