Done! C++ Fork

Thanks for your report, I will add this edge cases and publish the fork with updates.

You should log an issue on the discourse page. I believe test cases should be added for this.