fixes initial loading of files
Merge pull request #30 from sintefmath/initial_file_loading

fixes initial loading of files