fix
Merge branch '2D-kernel'