Use our billy fork which contains changes for #9