Add support for Expressions within templates
Merge pull request #37 from mlabrum/expression

Add support for Expressions within templates