1.0.1 merge