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