Merge pull request #169 from deba/komal

nightly updated from Komal