package renamed
updated vitter (merge)