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