LucianoGSilvestri comments

Results 2 comments of


                                            LucianoGSilvestri

I have fixed all the conflicts. The PR is ready for review

Thanks @lu1and10. I was able to install the python wrappers via `make python` after pulling the new commit.