v1.0.2 - bugfixes

Couple of bugfixes