Fix issue and update to v0.1.26