handle_estimator : change condition or to and
Merge pull request #453 from aginika/handle-estimate-or-to-and

handle_estimator : change condition or to and