update version number and merge some pull requests.