Merge branch 'master' into branch_lin
add show book
Merge pull request #10 from g2-aj/branch_lin

Branch lin