merge w. giulio (master)

w. direction vector,

1 1 1 = xyz
1 1 0 = xy
0 0 1 = z