merged latest master from David