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