Fix error whilst writing data to disk not being relayed to master
Fix errors receiving/sending files
Merge remote-tracking branch 'origin/master'