reverted #25 PR and added #27 I think now you can merge