I don't know why, but it looks like it's needed.
Extra checking for existing of "Dir" setting
Now working with no property
Code style
Just stuff
Merge branch 'junit' (fixes were there)