Made expression configurable
Merge pull request #1 from pkruithof/master

Made expression configurable