fix build errors
Merge pull request #81 from xabbuh/fix-build-errors

fix build errors