Pr/25

References: https://github.com/scottmotte/dotenv/pull/25

but with adjustments to make test pass.