Release 2.0.2

Improvements