fix compile errors in develop branch
Merge pull request #99 from jembi/fix_compile_errors

fix compile errors in develop branch