Adding back in "sourcePath" property
[CSVDIR-5] - Empty strings  ' "" ' values found
 - Patch from Francesco applied
Small improvements, clean up, and so on
Merge fom master