Merge pull request #352 from svost/c++11