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