Merge pull request #1 from larryv/master

Avoid implicit initializer narrowing to enable C++11 build.