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