C++ 98 version without macros
Merge pull request #53 from panzi/master

C++ 98 version without macros