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