Updating: adding contrib/OpenMP; tidying-up