Bug fixes
Update
Merging c++ project with the original python project.