Merge

Merge nezticle changes