Merge pull request #542 from Slesa/develop

Issue #541: look first in default path for a tool