Working version
Merge https://github.com/Dimchik78/crossandzero