(v0.7.9) Many improvements