Use personal fork until issue #20 is pulled