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