Merge branch 'Kala'
kala 1