Fixes and 3.10.11 added #40

Credits @Cpasmoi @ingbrzy