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