Implemented suggested changes proposed in #34
Ast Changes now merged into master. closes #34