Improved the way the target files are found so that there's no doubloon left.
Merge branch 'feature64' into dev
Improved the way the target files are found so that there's no doubloon left anymore.