Update to v0.0.2 with contribution from @gavboulton