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