Polished scripts
Merge master (remote) changes