Fix for #31 to enable different environments
Fix for #31 to enable different environments