Improve the script.
Merge pull request #1 from alkemist/master

Some improvements to the script.