Sync with changes in book
Merge branch 'master' of https://github.com/IanDarwin/javasrc
Simplify