script for testing
some polish
2
Merge branch 'Atlas_3' into Master_2