Merge pull request #480 from micmac1/kam-mods