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