fix bug: silly bug $and => $or
Merge pull request #6 from liyu1981/dev

fix bug: silly bug $and => $or