Issue 363

@DinisCruz This is better. Still issues with the occassional entire file being overwritten. Is this something you can handle easily during merge?

And hoping for feedback before making further changes.