test
merged
Boundary conditions implemented.