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