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