Merge pull request #525 from micmac1/master-kam-funroll