Work in progress for dependency problem
Merge branch 'master' of https://github.com/omega-hub/omegaOsg