updated for 1.0 r6; fixed double install