my edits to the script
Merge pull request #1 from markwilkinson/master

my edits to the script - Alejandro, please pull