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