Fix for = char in Env variable

Thanks to @zedar187 for initiating the pull request. I had to change the approach but now the issue of having = in env variable value is fixed. This fixes #78