trying to make scripts macosx friendly
Merge branch 'master' into macosx