improved script consistency across OSs
Merge branch 'master' of https://github.com/ULAFF/software
modified paths