merge commit final 1.0