fix merge issues
fix node issue
add another route param
Merge pull request #72 from birdage/update_toc

Update Toc and fix markers