Added C++ version
Added Partner finder