upgrade to use ast
Merge pull request #14 from pjritee/master

upgrade to use ast