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