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