Merge branch kitkat  from Dazzozo