Fix RH compilation issues
Merge pull request #130 from bilgili/master

Fix RH compilation issues