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