merge with 1.0