Kaali edits
Merge origin/master