export PDF option
upgrade version
merge master