Merge pull request #1 from Sleepwalking/master

UNIX compat fix
Merge pull request #3 from Sleepwalking/master

CVSEdit
Merge pull request #4 from rgwan/master

My God