Fixing build issues
Merge pull request #120 from jeewamp/master

Fixing build issues