merge
new script
merged with master