Added functionality and omp support
Added functionality and omp support