Merge pull request #152 from CyberCRI/expressions

Expressions