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