further refactoring for final version
Merge branch 'master' of https://github.com/woland84/kat