merge develop branch into master branch. bump the version number to 2.10