Update jbo's info
Merge branch 'master' into doc
Use relative paths