Feature/0.9.8

To track the overall diff