merge version 3.0.0