I merged it and made some changes here: 081ee864ce2fe276eadbb6defa0e0062aa247695