I'm putting a PR against this branch to solve this. Should help.