1.2
Merge branch 'master' of https://github.com/marbor83/Kairos