Merge pull request #323 from micmac1/ast-up