Fixes issue 69
optimisation works in 2D and 3D and in //
added test
uncomment