Updated to instar 1.0.6, simplified some code