Added wrap and nowrap command options