Switch to my latest commit that fixes various bugs