Addresses #30, and the French part of #29.