Issue54 cp water

Pull request for #54 .
Reviewed @marcusfuchs changes.
Merged master to development branch.
Rerun regression tests and updated reference results.