added new scripts, updated ESF parser
Merge remote branch 'origin/master'