rudimentary annotation support
refined a little on the annotations
Merge remote-tracking branch 'origin/master' into gh-pages