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