merge pull requests and update ver.0.5.2