Added FindWithQuery
Merge remote-tracking branch 'remotes/original_version/master'