AC-1079 add condition attribute to retain ability to rebuild the original expression.
Merge pull request #11 from wlmcewen/master

AC-1079 add condition attribute to retain ability to rebuild the origina...