Kal update
Merge branch 'ovia_fix' of https://github.com/ovuline/Kal into ovia_fix