v0.9.5 first fix && some new features