1.0.0.6 fixing bugs