Find env vars dynamically instead of hardcoding
Merge pull request #1 from tomfotherby/patch-1

Find env vars dynamically instead of hardcoding