Upgrate to 1.0.8