Merge pull request #180 from thaliproject/update-conditional-compilation-flags

update conditional compilation flags