Updated grammar and sample program.