Put file info into temporary variable. Fixes #136
Merge pull request #425 from maskas/2.1

Put file info into temporary variable. Fixes #136