adding scripts
merge from master