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