Minor changes
Merging with master
Updated Poisson solver