pull recent changes from @deflaux

that is all