Implemented WHERE clause
Merge branch 'where'