Linting files
Updated environment settings
Merge remote-tracking branch 'upstream/master'