merge master
merged with latest generators branch using Makefile with scripts