Merge pull request #268 from micmac1/kam4-for-1701