Giving the possiblity of overwriting the file write delay (default = 10 seconds) for testing purposes
Merge remote-tracking branch 'upstream/master' into file_write_delay
Merge remote-tracking branch 'upstream/master' into file_write_delay
Merge pull request #15 from AlexandreBeaulne/file_write_delay

File write delay
Reverting changes introduced in Pull Request #15
Merge pull request #18 from AlexandreBeaulne/unstable

Reverting changes I introduced in Pull Request #15
Fixing merge conflicts with pmembrey/unstable