Mac/linux compatibility
Merge branch 'bastien' of github.com:Babouchot/Epoch into bastien