update to 1.1.5 and branch 1.0.7