merged latest master from David

and renaming to acid...