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