Merge pull request #163 from da2ce7/develop

add fix for C++03
Merge pull request #164 from da2ce7/develop

add fix for C++03 pt2