some fixes
Merge branch 'master' of http://github.com/Aforan/OpenMP

some fixes