added
fixed
restore shell script added
Merge branch 'test' into develop