Merge pull request #324 from micmac1/ast-modules-up