Add support for subexpressions
Merge pull request #126 from mmun/subexpressions

Add support for subexpressions