修改一处自相矛盾的地方

"some_condition and do_something" => "some_condition && do_something"
Merge pull request #16 from wansongying/patch-1

修改一处自相矛盾的地方