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