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