last
Merge remote-tracking branch 'upstream/master'
removed omp
Merge remote-tracking branch 'upstream/master'