Updated to properly handle OR predicate (Thanks to @tsvijayan)
Merge branch 'master' of github.com:project-imas/encrypted-core-data