increase version
merge master