Merge pull request #169 from deba/komal

nightly updated from Komal
Merge pull request #170 from deba/master

Merge pull request #169 from deba/komal