Merge branch 'master' of https://github.com/CitiSent/candidatometro