added basic where clauses
Merge branch 'where-clauses'