Merge pull request #266 from micmac1/kam-master