ADDED check for where key
Merge pull request #15 from SoSocio/CheckConditionsWhere

ADDED check for where key