wzg fix bugs and update version to 4.0.0.36