readding conditional to avoid loading files twice
Merge pull request #37 from amaierhofer/fix_loading_files_twice

readding conditional to avoid loading files twice