Initial bit to read files on the same server in.
Merge remote-tracking branch 'origin/master'