C++ solution using a Functor
Remove header that isn't used
Merge pull request #50 from TrueJournals/master

C++ solution using a Functor
C++ 98 version without macros