Merge pull request #531 from micmac1/ast16100