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