Better requirements
env renamed to os_environ
Merge