FIX: https://github.com/uic-evl/omegalib/issues/95
Merge branch 'master' of https://github.com/uic-evl/omegalib