Merge pull request #2 from bashkarev/master

error merge with

Document.php

@@ -884,7 +884,7 @@ public function find($filter = [], $options = [])
 
 		$query = $this->getDbCriteria();
 		if($filter instanceof Query){
-			$query->mergeWith($this->getDbCriteria());
+			$query->mergeWith($filter);
 		}else{
 			$query->andCondition($filter);
 		}