Last 0.0.2 fixes