Modified script to reflect exit code accurately
Merge branch 'modestymaster-master'