merged the two c++ wrapper files