Added periodic boundary conditions
Merged