Escape underscores in variable name
Clarify calculations of data section & file offsets from search tree values
Merge branch 'master' into gh-pages