Fix build failure
Merge pull request #102 from SvetlinZarev/fix_issues

Fix build failure