hecanjog Merge branch 'master' into omp