Feature/openmp

@mikebosse this pulls in your openmp changes.