Fix for file_reader
Merge origin/master