Minor changes scripts
Fixed scripts to check if the environment variables are defined or not
Merge pull request #65 from angelrti/master

Fixed scripts