Updated with 1.0.6