Linux compatibility

Test and merge