copy changes from master
fix mistakes in generate.sh
run generate.sh