Elly: 2.0.2

Couple small fixes