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