Fixed compilation under unix
merge