Merge pull request #691 from dorkster/bugfixes

Skip loading files if base directories are identical