merging environment changes into working branch
updating version