added french, merged with master