Merge pull request #411 from micmac1/ast16