New scripts

merging development branch into master