Merge branch 'devel'
update doc
Merge branch 'master' into devel