Refactoring. Added kind of function in compare.mako
merge commit
Merge branch 'master' of https://github.com/thumbtack-technology/training-2013-correlator