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