added expressions to where condition

Closes #42