Workaround for compilation error on some compilers
Merge pull request #271 from peastman/master

Workaround for compilation error on some compilers