closed #64 - and refactored a little for smaller methods...
Merge branch 'hotfix/#64_nonNull_baseDir_MLRC'