Small script improvements
Merge pull request #1 from artspb/master

Small script improvements