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