std::make_shared for c++
Merge remote-tracking branch 'k2/master'