Environment map
Merge branch 'master' of https://github.com/fredrik-k/Report
merge