Fixed MAC OS X broken build
Merge branch 'master' of https://github.com/uic-evl/omegalib

Merged with latest version