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