Merge pull request #98 from gotthardp/no_macro_overload2

BUGFIX: Avoid overloading the LOG macro.