Merge branch 'hotfix/0.0.0.3'
changing to environment variable setup
Merge branch 'hotfix/0.0.0.4' into develop