Update to 1.0.2

Fixes #33 and #34