Merge pull request #2 from simock85/master

Merge fixes to the collapse of multiple files with same name on load
More concise version of the collapse of duplicated files on load bugfix