completed zing part
Merge branch 'master' of https://github.com/santa222/newCode into mika_dev