Merge pull request #2 from zgao/master

merge New
added parallelization, must now be compiled with flag -fopenmp
Merge pull request #11 from doctorbatmangod/master

added parallelization