ISSUE-1 added the environment variables as suggested by paulomcnally.