Added bundle_binstubs option