Merge pull request #10 from jonathanworth/master

get latest changes
updates to menu and loctree
Merge pull request #19 from jemble/master

Pull From Master