Merge branch 'master' into dev
update pdf version
Merge branch 'dev'