Added environment map - branch "envmap"