Merge pull request #657 from micmac1/kam-arm