Added a simple parallelization scheme of the meand fields.
Fixed some git conflicts.