JAL-3393 improved flexibility of script and updated doc