Merge pull request #394 from micmac1/kama-hot