updated with rel-1.0.0 from cvs