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