cpp fixes
fix cpp flags
Merge pull request #5 from robertzk/cpp_fixes

Cpp fixes