Better (and more random) file generating
Merge remote-tracking branch 'origin/master'